Fix imports of the "electron" module that are missing an Electron guard #4935
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix imports of the "electron" module that are missing an Electron guard
Pull Request Type
Related issue
Noticed them while working on #4931
Description
Currently some of our imports of the
electron
module are correctly guarded byIS_ELECTRON
checks, others unfortunately are not which means the web webpack config (and the downstream Android one) need to tell webpack to ignore theelectron
imports. This pull request adds the guards in the places that there were missing.I recommend turning on GitHub's
Hide Whitespace
setting while reviewing this pull request, especially for thesrc/renderer/store/modules/settings.js
file.Testing
Run
yarn run pack:web
, if it doesn't complain about not being able to bundle Electron, I didn't forget to add a guard.Desktop